build: Always do enum scanning now
authorColin Walters <walters@verbum.org>
Thu, 8 Dec 2016 02:00:21 +0000 (21:00 -0500)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 8 Dec 2016 16:34:06 +0000 (16:34 +0000)
Since we stopped including the libsoup headers in `ostree-fetcher.h`,
we can now unconditionally do enum scanning, and drop a build time
conditional.

Prep for libcurl porting.

Closes: #620
Approved by: jlebon

Makefile-libostree.am

index d6ae60235deb5126065ac7cbc197647af594ca4d..a7d7b11b1e4fb95f2942410a19020d6d7ea76830 100644 (file)
@@ -34,10 +34,7 @@ libostreeincludedir = $(includedir)/ostree-1
 libostreeinclude_HEADERS = $(libostree_public_headers)
 
 ENUM_TYPES = $(NULL)
-
-if USE_LIBSOUP
 ENUM_TYPES += $(srcdir)/src/libostree/ostree-fetcher.h
-endif
 
 src/libostree/ostree-enumtypes.h: src/libostree/ostree-enumtypes.h.template $(ENUM_TYPES)
        $(AM_V_GEN) $(GLIB_MKENUMS) \
@@ -50,14 +47,11 @@ src/libostree/ostree-enumtypes.c: src/libostree/ostree-enumtypes.c.template $(EN
        --fhead "#include \"ostree-enumtypes.h\"" \
        $(ENUM_TYPES) > $@.tmp && mv $@.tmp $@
 
-if USE_LIBSOUP
 ENUM_GENERATED = \
        src/libostree/ostree-enumtypes.h \
        src/libostree/ostree-enumtypes.c \
        $(NULL)
-
 BUILT_SOURCES += $(ENUM_GENERATED)
-endif
 
 CLEANFILES += $(BUILT_SOURCES)